Merge 5.10.255 into android13-5.10-lts

Changes in 5.10.255
	xfrm: esp: avoid in-place decrypt on shared skb frags
	Linux 5.10.255

Change-Id: I7744e0a1903b77db4eb7d81e28821490a11b8658
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Makefile

diff --git a/Makefile b/Makefile
index 7a00057..5bc453b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 5
 PATCHLEVEL = 10
-SUBLEVEL = 254
+SUBLEVEL = 255
 EXTRAVERSION =
 NAME = Dare mighty things
 

net/ipv4/esp4.c

diff --git a/net/ipv4/esp4.c b/net/ipv4/esp4.c
index 9ad5e88..400a86d 100644
--- a/net/ipv4/esp4.c
+++ b/net/ipv4/esp4.c
@@ -921,7 +921,8 @@ static int esp_input(struct xfrm_state *x, struct sk_buff *skb)
 			nfrags = 1;
 
 			goto skip_cow;
-		} else if (!skb_has_frag_list(skb)) {
+		} else if (!skb_has_frag_list(skb) &&
+			   !skb_has_shared_frag(skb)) {
 			nfrags = skb_shinfo(skb)->nr_frags;
 			nfrags++;
 

net/ipv4/ip_output.c

diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index 65b0ae2..f9c0e8e 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -1447,6 +1447,8 @@ ssize_t	ip_append_page(struct sock *sk, struct flowi4 *fl4, struct page *page,
 			goto error;
 		}
 
+		skb_shinfo(skb)->tx_flags |= SKBTX_SHARED_FRAG;
+
 		if (skb->ip_summed == CHECKSUM_NONE) {
 			__wsum csum;
 			csum = csum_page(page, offset, len);

net/ipv6/esp6.c

diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c
index 194cc6cc..de3d333 100644
--- a/net/ipv6/esp6.c
+++ b/net/ipv6/esp6.c
@@ -970,7 +970,8 @@ static int esp6_input(struct xfrm_state *x, struct sk_buff *skb)
 			nfrags = 1;
 
 			goto skip_cow;
-		} else if (!skb_has_frag_list(skb)) {
+		} else if (!skb_has_frag_list(skb) &&
+			   !skb_has_shared_frag(skb)) {
 			nfrags = skb_shinfo(skb)->nr_frags;
 			nfrags++;